first working version with new layout