many changes, should be more mobile friendly