cleaned up, better orientation behaviour, layouts