fix sidebar aligment and upstate buttons