Version 2.0

Refactored layout, fixed a crash