Layout changes

Added a dropdown menu
Some changes

Some "according-to-Git-necessary"-changes