iOS7 Support - Minor bug fixing

Added first features for supporting iOS7 after some issues with
UIButton. Minor bug fixing and code indenting