Clean margins, width & height usage, make small ui improvements