Final commit

functionality is fully implemented.
Layout update
Small code style change
Another small change