Updated: More Templates

Small bug-fixes: tooltip placement, button sizing, etc