Changed a few things on presentation tier