refactored fx and mobile layouts