Refined layout and added some error handling