Fix Layout bugs when on device

Signed-off-by: cameronbourke <cameron2295@gmail.com>