Revert "Feature/bug fixes"

Reverts stakes/Frameless#4