Removed Unused Code, Updated layout, began alarm implementation

Alarm implementation not done.