Had some problems with the table layout (especially when having more than 3 columns)
Now it is better!