Small adjustments
Layout changes. Isn't finished yet