Layout is done
Little fixes