fixed a lot of problems
fixed a few layouting issues