Fixing errors. Layout still needs to be changed.