UI restructuring to accomadate the 'New message' feature