ui and positioning tweaks