Restarted Development with new layout