Merging local and repository code. Added basic boostrap styles