Fixing sizes and making things nicer