Version 0.5

Running Version, fixed some layouts
Version 0.5 final

Now final commit