Version 2.0

Complete new design