EmptyLayout code refactored
Welcome page refactored