Move to a proper tiled layout + shortcuts