code cleanup, fixed views on small devices