Fixes after advisor's review. Some layout problems still present though.