no more title/buttons overlapping and proper exports