Making some changes to be more mobile friendly