fixed rotation
refactoring and shape css