File upload support
Updated layout