big clean up, layouts working now, stable version 31.07.2014