Layout changes and sass theme