justified buttons + restructure