First working version of subject layout. Still testing...