Layout fixes & updated README To-Do