Updated layout.
More layout tuning.