Fix sample-count
Work on layout
More layout fixing