More layout changes

Made the arrangement of the elements more dynamic...